[BUG #6947] fix Single Value Binding cleanup