Another attempt at fixing bison compatability problems
This version works with bison 2.5