Fix by @adamgins - data wiped on update #2