Reverting back the fix