Replace no warnings fix after bad merge