fix bug in bucket creation
merged