Fixed store bug