1. custom event fix