fix regression due to sloppy merging