Fixes #3260
Merge pull request #3262 from alias1/patch-1

Fixes #3260