Fixed inconsistent return points