Accept #C2 changes