bugfix data storing