Emi - fixed for UATNBSSH003