partial fix for HEMERA-3733
fix for HEMERA-3769