Fix bug with two barrels mode