maybe fixing issues with wallets