diff --git a/src/passes/3-self_ast_simplified/tezos_type_annotation.ml b/src/passes/3-self_ast_simplified/tezos_type_annotation.ml
index d79ab628d..a6436257f 100644
--- a/src/passes/3-self_ast_simplified/tezos_type_annotation.ml
+++ b/src/passes/3-self_ast_simplified/tezos_type_annotation.ml
@@ -1,11 +1,29 @@
 open Ast_simplified
 open Trace
 
+module Errors = struct
+  let bad_string_timestamp ts loc () =
+    let title = (thunk ("Badly formatted timestamp \""^ts^"\"")) in
+    let message () = "" in
+    let data = [
+      ("location" , fun () -> Format.asprintf "%a" Location.pp loc)
+    ] in
+    error ~data title message ()
+end
+open Errors
+
 let peephole_expression : expression -> expression result = fun e ->
   let return expression = ok { e with expression } in
   match e.expression with
   | E_ascription (e' , t) as e -> (
       match (e'.expression , t.type_expression') with
+      | (E_literal (Literal_int i) , T_constant (TC_timestamp)) -> return @@ E_literal (Literal_timestamp i)
+      | (E_literal (Literal_string str) , T_constant (TC_timestamp)) ->
+        let%bind time =
+          trace_option (bad_string_timestamp str e'.location)
+          @@ Memory_proto_alpha.Protocol.Alpha_context.Timestamp.of_notation str in
+        let itime = Int64.to_int @@ Tezos_utils.Time.Protocol.to_seconds time in
+        return @@ E_literal (Literal_timestamp itime)
       | (E_literal (Literal_string str) , T_constant (TC_address)) -> return @@ E_literal (Literal_address str)
       | (E_literal (Literal_string str) , T_constant (TC_bytes)) -> (
           let%bind e' = e'_bytes str in
@@ -13,4 +31,4 @@ let peephole_expression : expression -> expression result = fun e ->
         )
       | _ -> return e
     )
-  | e -> return e
+  | e -> return e
\ No newline at end of file