Fixing camera conflict