Fix bug
Merge branch 'model-prototype-collection-bugfix'
Closes #3