Suggestion from redsquirrel was approved by redsquirrel - May 29, 2022

Suggestion from redsquirrel submitted for review - May 29, 2022