Fix of performance issue