Fix location issue - Credit to AOSPA