Fix older buttons