Fixed another bug for model state