manual fix for location :)