Revise #40