fix button handling to deal with latest spec change