This resolves #1566. Signed-off-by: Lorenzo Orsatti <49567430+lorsatti@users.noreply.github.com> Co-authored-by: Christopher Phillips <cphillips918@gmail.com>