Fixed race conditions in parser, hopefully