Fixes #7301
Merge pull request #7302 from Zuhayr/master

Fixes #7301, merge ASAP