Fix storage event bug