Address improvement in PR #11
Address improvement in PR #11