fix for scrub
Merge pull request #691 from Tendrid/develop

fix for scrub