Revert "Fixed Parsing"

This reverts commit 365f4b243e5ad56927bbb8218026333530c6e9da.