Fixed location issue - Credit to AOSPA