Workaround for #67. Shoudl be removed when Graphiti is updated in Luna
SR1.