Fix the most common

performance issue