jep, still fixes