fixed scrubber issue