Tweak and correct the original fix