Fix Paul's commit