TMDM-7702: further bug fix on EE