Button buggfix