Finally fix those stupid graphs