Fixing issues with binding to values