fixes HEMERA-3583
test for HEMERA-3583