Revise #38.1