Corrected coordinate switching