Fix #2168
Merge pull request #2169 from fdlk/fix/2168

Fix #2168