Fixed a performance regression