Fixed missing return