Actually fixed crash when changing views