Minor bug fix
Merge branch 'refs/heads/Databinding'