hack: temporarily fix issue with buttons