One more fix for bamboo