Fix unbind issue