Bug Fix in Model