Fix #2525
Merge pull request #3231 from staticfloat/master

Fix #2525