fixed N_SE-49233, toggle handler code was duplicated