Overwrite bug fixed