Fixed clearStorage