Adapt to @octo's comments for PR #344