Fixed the infinite loop in make_simple_command()