Fixed parsting bug when using custom command.