Rework producer logic.