performance issue fixed