Fixing whitelist vs blacklist issue