Suggestion from Peter206 submitted for review - August 7, 2022

Suggestion from PalinooSVK submitted for review - August 3, 2022