Add the fix for PolicyStorage