DDF-953 fixed threading error