fix issue when fetching wallet