Added workaround for DATAGRAPH-451.