Small bugfix for max_delay handling