Add all the return to meet 1.7