fix for ENYO-2945, dependent on fix for ENYO-2944