r22464: remove double code and use a function