CAM-03 fix