* made location transitions slightly more stable