Parser should now be more stable