Fixed command handling.