fix storage clasess.