[BUGFIX] Repair the reoccurence feature