Bug Fixed

Location Bugs