try fix Issue AND-160  (part 2)