Fixed the scrubber issue