Fixed issues with coordinates