r1651 modify for PMlib-3.0.0