Revert MOD - Fix 6