#365 fixing graph