[COMMIT] fix for EPIA performace problem from Kevin Hester