Fixed clone and overwrite existing