Fix for ZEn-15044