Make overwrites safer