minor changes to make parsing compatible