Fixed bug where locations wouldnt set correctly if done through time