minor performance issue fixed