Fixing 3 way data bind issue