Fix for EAP build format