Better maximum delay handling (related to issue #8)