Active button bug was fixed