Fix-For-Location-Issue