Fixed so overwriting works properly.  Close #1