Fix bug in abbreviation parsing

This required an UGLY hack.