Fixing #1148.
Merge pull request #1156 from diegoeis/3.4.0

Fixing #1148.