Adding the fix