Fix butchering
Merge pull request #3931 from i2amroy/Butcher-fix

Fix butchering