fix to work with multi-enf