Use avail instead of delay to avoid glitches

Use avail instead of delay to avoid glitches #1674