Storage Service fix

Signed-off-by: Maxence Charriere <maxence.charriere@outlook.com>