Fixed bad triggering