Fix whitelisting