Improve on the fix submitted yesterday