correct a bug on the model
merge