Fix GIRAPH-934