Whitelist bug fix