Fixes Models, issue #56

Fixes #56