Fix for commands using mulitple input parameters