Fix when scheduler returns a tuple instead of a list (#951)

Fix when scheduler returns a tuple instead of a list (#951) #42