Use patched diamond version