try fix Issue AND-160