Button index fix