Overwrite fix