Fixed parser to build against rust incoming