diff --git a/include/lang/de.rem b/include/lang/de.rem
index 77400a55..17b2089f 100644
--- a/include/lang/de.rem
+++ b/include/lang/de.rem
@@ -48,12 +48,13 @@ FSET subst_ampm(h)      iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmi
 FSET subst_ordinal(d)   "."
 
 FSET subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_a(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 
-FSET subst_b(a, d, t)   iif(d==today(), $Today, d==today()+1, $Tomorrow, "in " + (d-today()) + " Tagen")
+FSET subst_bx(a, d, t)   "in " + (d-today()) + " Tagen"
 
 FSET subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
-FSET subst_g(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
 
-FSET subst_u(alt, d, t) subst_a(alt, d, t)
-FSET subst_v(alt, d, t) subst_g(alt, d, t)
+FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
+FSET subst_vx(alt, d, t) subst_gx(alt, d, t)
+FSET subst_p(alt, d, t) iif(d == today()+1, "", "en")
diff --git a/src/dosubst.c b/src/dosubst.c
index ae6cdc0c..fb6901a7 100644
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -125,7 +125,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul,
 #else
     r = -1;
     if (UserFuncExists("subst_ampm") == 1) {
-        snprintf(s, sizeof(s), "subst_ampm(%d)", h);
+        snprintf(s, sizeof(s), "subst_ampm(%d)", ch);
         expr = (char const *) s;
         r = EvalExpr(&expr, &v, NULL);
         if (r == OK) {