adjustments based on comments of PR #418