fixed returns

possibly???