Fixed models problems

Fixed models problems