Graph generation fixed