Got rid of weird Button State automatic duplicates