Fixing camera swapping