Fixes bucketOverrides mechanism