V3 1 x

fix issue #1385