Finishing the fix