Fixed event triggering bug - ref #3