Merge branch 'fix/bufoverflow_tempo' (thanks to @niugx)