#532 graph fixed