Avoid stuffing entries