Fix the Camera issue