EUCA-7593
same issue as 7595. fixed