Fix for ENYO-2385