Fix for issue #1357
Merge pull request #1797 from cacaodev/issue1357

Fix for issue #1357