fixes #1085
changed name of property
minor fixes
Merge pull request #1645 from enesakar/master-issue-1644

fixes #1644