small regression intorduced during merge