Making the fix even better... Much better :)