Fix for nomaster view