Fixed re-opening issue in storage service