Fixed GraphParser