improve unbind behavior