Fix the way @location works