New version fix performance