Made live binding work properly