Fix recursive button issue