fix issue with storage custom events