fixed trunk-3448