Fix problem with graphs