[beepy]

I think I've fixed this (hopefully without breaking something else). Give it another look if you can and let me know.