Fixed controller + camera
Fixed controller + camera