Update to r39182, fix issue #7.