Fixing barrel bug [2]