conform to earlier commit