Fixed #2196
Merge pull request #2197 from jensscherbl/integration

Fixed #2196