added check in storage