DF-2975 input issues fixed