Previous fix tweaked for Compass

Changing the previous fix so it uses the Compass method and added a
comment to identify why it's there.