Trigger fix