added some missing returns