Made old parser work properly.