Fixed button handling.