Fix issue with passing only storage key