solved performance issue