Suggestion for Issue 45