Fix #1969
Merge pull request #2095 from fdlk/fix/1969

Fix #1969