Fix some strangeness with the delay...