data persistance bug fixed