Fix bug when no default 'layout' is given