Temp fix for nil bucket