Resolve #6524 --------- Signed-off-by: igrucci <babichevigor12@gmail.com> Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> Co-authored-by: Tyler Yahn <codingalias@gmail.com>