Fixes issue #1. Parser needs a rewrite NOW