Fix persistence of deadline