Reflect changes from PR #222