Fix deadlock on remove_node (#331)

Just workaround;  this issue should be resolved by redesign