Issue-669