valgrind bitches in store -> fix!