S60525: added toggle check