Fixed bind() and unbind() issues