Fix bug store data