Wrap $params on scalar comment value

Please merge it