Resolved performance issue