fixed generate commands