Bugfixes/485 cameracrash

#485