fix for EUCA-10005