Fixed return "N/A"