diff --git a/src/solve.jl b/src/solve.jl
index f6f506f..0c51eaa 100644
--- a/src/solve.jl
+++ b/src/solve.jl
@@ -77,9 +77,9 @@ function DiffEqBase.__init(
     # of the form f(du,u,p,t) or f(u,p,t) such that ODE algorithms can be applied
     dde_h = HistoryFunction(prob.h, sol, integrator)
     if iip
-        dde_f = (du,u,p,t) -> prob.f(du,u,dde_h,p,t)
+        dde_f = ODEFunction((du,u,p,t) -> prob.f(du,u,dde_h,p,t))
     else
-        dde_f = (u,p,t) -> prob.f(u,dde_h,p,t)
+        dde_f = ODEFunction((u,p,t) -> prob.f(u,dde_h,p,t))
     end
 
     # absolut tolerance for fixed-point iterations has to be of same type as elements of u
diff --git a/test/dependent_delays.jl b/test/dependent_delays.jl
index b18fed0..5042f86 100644
--- a/test/dependent_delays.jl
+++ b/test/dependent_delays.jl
@@ -11,7 +11,8 @@
 
     @testset "constant lag function" begin
         # constant delay specified as lag function
-        prob2 = DDEProblem(DiffEqProblemLibrary.f_1delay, [1.0],
+        prob2 = DDEProblem(DiffEqProblemLibrary.DDEProblemLibrary.f_1delay,
+                           [1.0],
                            (p, t) -> [0.0], (0., 10.),
                            dependent_lags = [(u,p,t) -> 1])
         dde_int2 = init(prob2, alg)
@@ -42,7 +43,8 @@
 
     # without any delays specified is worse
     @testset "without delays" begin
-        prob2 = DDEProblem(DiffEqProblemLibrary.f_1delay, [1.0],
+        prob2 = DDEProblem(DiffEqProblemLibrary.DDEProblemLibrary.f_1delay,
+                           [1.0],
                            (p, t) -> [0.0], (0., 10.))
         sol2 = solve(prob2, alg)