fix new extra buttons bug