Additional fix for OPENIDM-1289