Fix for WSH arguments iteration