fixes with generate schedule