Fix for switch view