Fixed bug in the scheduler
Removed workaround in extractors