Fix after second round comments