Add Mutex to follow other parsers manner