Fixed with Graph Controller