Wallet Fix