commoncpp2: fix again