Fix for top level graph