Bug in command handling.