Fixed Command class.