Fixing wallet listener