fixes #1300
fixes #1300
Merge pull request #1476 from tbasilici/3.5

3.5