[#14] First attempt to fix SearchNextTrain bug