Improvement to ws skipping