SYN-10874 fix