Merge pull request #2553 from amdrexu/bugfix