Fixed button problem