fixing whitelist stuff