fix issue M-421