fix bug where FinalFields is not present in graph