fixes e4 integration as requested in #13