improved default commenting
fix regression introduced by commit 90b62612cd8c6a06a6f1e6ed62c1338b4a55f423