Fix node validator (use and instead of flatMap)