fixes #394 - added support for properties filling