DDF-588: Fixed input handling