DDF-953 fixed class cast exception