Fixed whitelisting issue