Quick layouttest fix until I make the real fix