Fix triggering mess