re-added whitelist due to auto whitelist problem