Whitelist: EP3 Protocol fix