Stop identifier overwriting on each save