Fixed command handling. Hopefully.