Fixed issue with find next train