Beep Fix #2