add control in order to avoid erroneous behavior on CLI Evaluation