(graphiti) Fixes #68

The solution is an awful hack. Waiting for better if someone has an
idea...