Fixed issue M-303.