Parser works properly now