Fixed the scheduling bug (fingers crossed)