Fixed special cases with different coordinatesystems.