Fix bi-directionnal binding problems