Add hack to deal with buggy yacc output