Fixes #2250
Merge pull request #2256 from pveentjer/performance-itopic

Fixes #2250