fixes EUCA-7979