More accurate location checking
Merge fixed