correction to coordinate system fix
Merge branch 'master' into coord-fix