#610: More revision