Improved the fix