Fixed make_command_stream.