Investigate and resolve issue #2445 on GitHub | Cosine