re-barrier fix