bring things in line with the submitted patch