improvement on the fix