Fixed weirdness with object locations