Client command parser fix.