Fix for the deadline flow