fix commands generation