CameraClient: Temp Fix