Barrels fix