Fixed bind/unbind issues