change mc constructor
fix compilation error
merge fix