Improve handling of next_producer