Update source fix bug #498,499