Parser now works properly