Correction in non-generic ICommandBuilder.