Fixed #807
Merge pull request #1148 from diguito69/master

Fixed issue #807.