Fixed binding loop issue