Fixed performance issue