Merge pull request #2826 from amdrexu/bugfix