Attempt fixing both storage on 4.4