Fix for layout not found