Added protection against overwrite (with cheap UI)