[Command] Some fix