TFJ-821 omit unnecessary "?" in the case no parameter is passed