Mrtyler noooo they be stealin my bucket

Fixes issue #206.