Fixing performance issue
Merge pull request #1002 from pecko/issue984_performance

Fixing performance issue