Fixes #40 (adaptive delay)