Switch to using a better parser that actually seems to work