Fixed double event trigger