Feature/fix store bug