Not using findEvent since it causes a bug on iOS
Not using findEvent since it causes a bug on iOS
Fixed a bug on Android