Parser works a bit better