Fix Command execution