Fixed inconsistent buttons bug