should've fixed buttons bug