Fixing problem on updating location