Bug fix for repeatable commands.