Fix overrideLocation