Issue-670