Changing on_write to write for consistency