Add more protection against scrubbing