Fix for ENYO-3128