Attempts to fix button issues