Fixing performance issue.