Fix dangling bucket reference