fix w1 issue #319