Fix W implementation