Fix wp-cli issue 736