Keep Waker around for longer so it works better (#2184).