Fixing barrel bug