Fixed scrubbing. See #20