Correct issue on first property created.
Merge origin/master