restore Paul's changes :-)