Attach/Detach node race interim fix