resolve rebinding bug