Suggestion from rudyxd was approved by Pierzyn - June 2, 2022

Suggestion from rudyxd submitted for review - June 1, 2022