fix for EN-24, EN-29 and EN-30