Fixed button bug