Fix for latest EAP