Added SuppressUntoggleHandler