Reflect changes made in PR #17