Rest of the fix