Fixed button handler