added scrubber
bugfix