Fixed performance regression