Added suport for non-delaying nodes