This issue is to follow up on PR #181
This issue is to follow up on PR #181