Data persistance issue fixed