WWC fix