Fix buffer delay miscalculations for real

Fixes #2212