DDF-538 Switched constant and variable
DDF-538: Fixed bug