Added the fix