Return the data point directly if only one, fix #1