fix pigiron/glue buckets
Merge pull request #643 from vanzomerenc/patch-2

fix pigiron/glue buckets (resolves issue #639) in 1.6.4 branch