fixes #2135
Merge pull request #2136 from fdlk/fix/2135

fixes #2135
merge with master