Fixed firebase overwrite issue