Possible fix to button issues