Tag corruption prevention