Fixed bug for point return