Suggestion for impl of #1141