added missing returns