Fixing overwrite issue