Fix for allowing buckets without bucket type