fixed getLocation