Fixed overaggressive replacement