fix checkModel method and remove skip from template