diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart
index 3bc1c1dd9..7105dcd26 100644
--- a/lib/utilities/enums/coin_enum.dart
+++ b/lib/utilities/enums/coin_enum.dart
@@ -356,14 +356,16 @@ extension CoinExt on Coin {
 
   int get decimals => Constants.decimalPlacesForCoin(this);
 
+  // Note: this must relate to DerivePathType for certain coins!
   AddressType get primaryAddressType {
     switch (this) {
       case Coin.bitcoin:
       case Coin.bitcoinTestNet:
       case Coin.litecoin:
       case Coin.litecoinTestNet:
+      case Coin.namecoin:
+      case Coin.particl:
         return AddressType.p2wpkh;
-        break;
 
       case Coin.eCash:
       case Coin.bitcoincash:
@@ -371,8 +373,6 @@ extension CoinExt on Coin {
       case Coin.dogecoin:
       case Coin.firo:
       case Coin.firoTestNet:
-      case Coin.namecoin:
-      case Coin.particl:
       case Coin.dogecoinTestNet:
         return AddressType.p2pkh;
 
diff --git a/lib/wallets/wallet/intermediate/bip39_wallet.dart b/lib/wallets/wallet/intermediate/bip39_wallet.dart
index a38ce6756..0ab794bdd 100644
--- a/lib/wallets/wallet/intermediate/bip39_wallet.dart
+++ b/lib/wallets/wallet/intermediate/bip39_wallet.dart
@@ -1,8 +1,8 @@
 import 'package:isar/isar.dart';
 import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
 import 'package:stackwallet/wallets/crypto_currency/intermediate/bip39_currency.dart';
-import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
 import 'package:stackwallet/wallets/wallet/wallet.dart';
+import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
 
 abstract class Bip39Wallet<T extends Bip39Currency> extends Wallet<T>
     with MnemonicInterface {