implemented the fix