fix w5 problems