V1.6 Camera fix, finished