Performance fix