Fix for_wrap that used tag and should not.