Camera fix pt2 (1/3)