fix type always & toggle trigger