DF-4241 fixed special character skipping