Runtime fix in layouts.default