fixed redundant return