Additional fix for OPENIDM-1266