improving the fix