Swapnumbers in command and select mode too.