fix storage listeners