Fixed issue M-330