Fixing reference for unbind and broken unbinding.