diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
index 5d480426f..3d97533c1 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
@@ -218,7 +218,9 @@ final case class DATA_CLOSING(commitments: Commitments,
 }
 
 final case class DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT(commitments: Commitments, remoteChannelReestablish: ChannelReestablish) extends Data with HasCommitments
-final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data
+final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data with HasCommitments {
+  override def commitments: Commitments = data.commitments
+}
 
 final case class LocalParams(nodeId: PublicKey,
                              fundingKeyPath: DeterministicWallet.KeyPath,
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
index 75741e94f..15d5a2990 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
@@ -58,7 +58,6 @@ object Helpers {
     case d: DATA_WAIT_FOR_FUNDING_CREATED => d.temporaryChannelId
     case d: DATA_WAIT_FOR_FUNDING_SIGNED => d.channelId
     case d: HasCommitments => d.channelId
-    case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d.data.channelId
   }
 
   /**
@@ -76,6 +75,7 @@ object Helpers {
       case d: DATA_NEGOTIATING => d.copy(commitments = commitments1)
       case d: DATA_CLOSING => d.copy(commitments = commitments1)
       case d: DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT => d.copy(commitments = commitments1)
+      case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d // TODO ignored
     }
   }