fix barrel again