fixes for overwrite