Fixing the whitelist mapping