fix: calculating next schedule should always just be from now (#2102)

fix: calculating next schedule should always just be from now (#2102) #2178