Fix command bug