The real Bamboo fix