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