fix regression by the last merge