CDMT-65 fixed
CDMT-66 NPE fixed