Re: wcmd fix