EPS fix 06->16