Fix short history move bug