Fix storage

Change-Id: I82ee7d2e383130089a117b66ff69ce8d3ea99ea3