Fixed Bug WMMCSMOD-71