1. Fixed bug in location