Fixed scheduler with josh