fixed bugs with buckets being passed around
1.6.2