See if this fixes the null buckets problem