Fixed data binding problem