TMDM-7415: fix the deficiency in code.