Hotfix.
Merge pull request #1017 from Bars107/master

Hotfix.