Added missing returns