Suggestion for issue #1