Issue raised as part of PR #149
Issue raised as part of PR #149