buttons bug fix