bucket handling fix