cherry pick
merge fix
Merge pull request #957 from flukeout/garbagefix

Garbage can sensitivity fix