bugfix for layouts