fix premature location change