XD-1372 Update to reflect changes suggested on the PR #625