Fix/826 model property create issue

Fixes #826