Originally pull request #444 Co-authored-by: ManlyMarco <39247311+manlymarco@users.noreply.github.com>