Changes from comments of PR #270