Fix the regression on model fix process. (issue #442)