completed build with tag wrapping fix