3 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index 7c15a40a4f..3143ed74fc 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -287,7 +287,7 @@ fetch_msg(Parent, ServerName, MSL, AutoHibernateTimeout, Debug, Hib) ->
 				      ServerName, {in, Msg}),
 	    handle_msg(Msg, Parent, ServerName, MSL, AutoHibernateTimeout, Debug1)
     after AutoHibernateTimeout ->
-	    proc_lib:hibernate(?MODULE, wake_hib, [Parent, ServerName, MSL, AutoHibernateTimeout, Debug])
+	    loop(Parent, ServerName, MSL, AutoHibernateTimeout, Debug, true)
     end.
 
 handle_msg(Msg, Parent, ServerName, MSL, AutoHibernateTimeout, Debug) ->
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 8da79c41f9..ac38105820 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -383,7 +383,7 @@ loop(Parent, Name, StateName, StateData, Mod, infinity, AutoHibernateTimeout, De
 		Msg ->
 			decode_msg(Msg,Parent, Name, StateName, StateData, Mod, infinity, AutoHibernateTimeout, Debug, false)
 	after AutoHibernateTimeout ->
-		proc_lib:hibernate(?MODULE,wake_hib, [Parent, Name, StateName, StateData, Mod, AutoHibernateTimeout, Debug])
+		loop(Parent, Name, StateName, StateData, Mod, hibernate, AutoHibernateTimeout, Debug)
 	end;
 
 loop(Parent, Name, StateName, StateData, Mod, Time, AutoHibernateTimeout, Debug) ->
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index a538e80211..ea5b57ad1c 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -372,7 +372,7 @@ loop(Parent, Name, State, Mod, infinity, AutoHibernateTimeout, Debug) ->
 		Msg ->
 			decode_msg(Msg, Parent, Name, State, Mod, infinity, AutoHibernateTimeout, Debug, false)
 	after AutoHibernateTimeout ->
-		proc_lib:hibernate(?MODULE,wake_hib,[Parent, Name, State, Mod, AutoHibernateTimeout, Debug])
+		loop(Parent, Name, State, Mod, hibernate, AutoHibernateTimeout, Debug)
 	end;
 
 loop(Parent, Name, State, Mod, Time, AutoHibernateTimeout, Debug) ->