Re-fix coordinate system bad refactoring..