Fix overwrite issue