Camera fix attempt 2