without EAP fix