DDF-807 - corrected arguments being cast to the Enum object instead of String