Fix #208 Scheduler now address reccuring events