data binding bug fix