Improve eupl_ok