Fixed more for bamboo review.