fix Store bugs