fixed rebind bug