Revise #34.2