Fixed button toggle bug