Bugfixes/485 cameracrash