Fix camera pt2 (2/3)