Patch around in the new arc code
Fix bug