Fix up Producer class