Added some more coordinate checks