Fixing Layout generator ref #15