Epi fix

Ported epi fix