As discussed, @clementgarnier will add more verification on the re-enqueued task.