Fix a new bug around delay variation