<a title="Some minor improvement and fix" href="https://github.com/opencor/opencor/pull/1869">PR #1869</a>: Some minor improvement and fix