fixes #407 - data binding issues