Resolution for #134 and fix for scrubbers