Fixed button state save