Finished the fix