Better ws fix