Suggestion to fix issue #1