Fix eps handling