fixed my own fix.
Merge branch 'graphalgofixes' into 2.1-maint