Investigate and resolve GitHub issue #2510 | Cosine