Commit #19

Fixed a databinding related bug.