diff --git a/src/proto_alpha/lib_protocol/sc_rollup_arith.ml b/src/proto_alpha/lib_protocol/sc_rollup_arith.ml
index 55dbf2452606c95785905cf4d094855fa1dac5c2..8f59dddc97497ddf0b6befea37cac7cc848d878c 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_arith.ml
+++ b/src/proto_alpha/lib_protocol/sc_rollup_arith.ml
@@ -1058,15 +1058,14 @@ module Make (Context : P) :
 
   let identifies_target_contract x =
     let open Option_syntax in
-    match Contract_hash.of_b58check_opt x with
-    | None ->
-        if Compare.String.(x = "out") then
-          return (Contract_hash.zero, Entrypoint_repr.default)
-        else fail
-    | Some _ -> (
-        match String.split_on_char '%' x with
-        | destination :: entrypoint ->
-            let* destination = Contract_hash.of_b58check_opt destination in
+    match String.split_on_char '%' x with
+    | destination :: entrypoint -> (
+        match Contract_hash.of_b58check_opt destination with
+        | None ->
+            if Compare.String.(x = "out") then
+              return (Contract_hash.zero, Entrypoint_repr.default)
+            else fail
+        | Some destination ->
             let* entrypoint =
               match entrypoint with
               | [] -> return Entrypoint_repr.default
@@ -1079,8 +1078,8 @@ module Make (Context : P) :
                   in
                   return entrypoint
             in
-            return (destination, entrypoint)
-        | [] -> fail)
+            return (destination, entrypoint))
+    | [] -> fail
 
   let evaluate =
     let open Monad.Syntax in
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_0).out
index 276b7ecf55ed642a926f25f6656f970069915f95..ffd935c23cb06425bae51d051bdff0460e3d0504 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_0).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_0).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000671
+    Fee to the baker: ꜩ0.00067
     Expected counter: 1
     Gas limit: 3211
     Storage limit: 6675 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000671
-      payload fees(the block proposer) ....... +ꜩ0.000671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00067
+      payload fees(the block proposer) ....... +ꜩ0.00067
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_5).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_5).out
index 276b7ecf55ed642a926f25f6656f970069915f95..ffd935c23cb06425bae51d051bdff0460e3d0504 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_5).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (_5).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000671
+    Fee to the baker: ꜩ0.00067
     Expected counter: 1
     Gas limit: 3211
     Storage limit: 6675 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000671
-      payload fees(the block proposer) ....... +ꜩ0.000671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00067
+      payload fees(the block proposer) ....... +ꜩ0.00067
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_0).out
index aa61e69130ca1728deb6d93f6b04895fa1110556..2fb08900cb9e3f01cf94d9486a0663ef34b9145d 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_0).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_0).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000671
+    Fee to the baker: ꜩ0.00067
     Expected counter: 1
     Gas limit: 3211
     Storage limit: 6675 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000671
-      payload fees(the block proposer) ....... +ꜩ0.000671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00067
+      payload fees(the block proposer) ....... +ꜩ0.00067
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_5).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_5).out
index aa61e69130ca1728deb6d93f6b04895fa1110556..2fb08900cb9e3f01cf94d9486a0663ef34b9145d 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_5).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (aux_5).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000671
+    Fee to the baker: ꜩ0.00067
     Expected counter: 1
     Gas limit: 3211
     Storage limit: 6675 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000671
-      payload fees(the block proposer) ....... +ꜩ0.000671
+      [PUBLIC_KEY_HASH] ... -ꜩ0.00067
+      payload fees(the block proposer) ....... +ꜩ0.00067
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_0).out
index b3b89b56276631a7057eb2685b5d715a6197ae17..678c98281d03f35c8711c9b1bb4a1fceea879ed5 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_0).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_0).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.004714
+    Fee to the baker: ꜩ0.004713
     Expected counter: 1
     Gas limit: 3227
     Storage limit: 10711 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.004714
-      payload fees(the block proposer) ....... +ꜩ0.004714
+      [PUBLIC_KEY_HASH] ... -ꜩ0.004713
+      payload fees(the block proposer) ....... +ꜩ0.004713
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_5).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_5).out
index b3b89b56276631a7057eb2685b5d715a6197ae17..678c98281d03f35c8711c9b1bb4a1fceea879ed5 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_5).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (_5).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.004714
+    Fee to the baker: ꜩ0.004713
     Expected counter: 1
     Gas limit: 3227
     Storage limit: 10711 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.004714
-      payload fees(the block proposer) ....... +ꜩ0.004714
+      [PUBLIC_KEY_HASH] ... -ꜩ0.004713
+      payload fees(the block proposer) ....... +ꜩ0.004713
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_0).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_0).out
index b3b89b56276631a7057eb2685b5d715a6197ae17..678c98281d03f35c8711c9b1bb4a1fceea879ed5 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_0).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_0).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.004714
+    Fee to the baker: ꜩ0.004713
     Expected counter: 1
     Gas limit: 3227
     Storage limit: 10711 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.004714
-      payload fees(the block proposer) ....... +ꜩ0.004714
+      [PUBLIC_KEY_HASH] ... -ꜩ0.004713
+      payload fees(the block proposer) ....... +ꜩ0.004713
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_5).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_5).out
index b3b89b56276631a7057eb2685b5d715a6197ae17..678c98281d03f35c8711c9b1bb4a1fceea879ed5 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_5).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (aux_5).out	
@@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.004714
+    Fee to the baker: ꜩ0.004713
     Expected counter: 1
     Gas limit: 3227
     Storage limit: 10711 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.004714
-      payload fees(the block proposer) ....... +ꜩ0.004714
+      [PUBLIC_KEY_HASH] ... -ꜩ0.004713
+      payload fees(the block proposer) ....... +ꜩ0.004713
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string