fixed interleaved bug introduced by 70c6d
Merged bug fix from branch 'brazil' into beeps