Minor change in the returning of the values