Another bucket bugfix