Fixed to work with new OutputQueue API.