[Hotfix] Bug #896
Merge pull request #897 from alex-zen/master

Hotfix for bug #896.