Storing location works much better