Fixed button controller bug