Tweak so that move() works properly