bar and club fix
merged