Revert "MOD - Fix 11"

This reverts commit 91278e22669027b22a5907ceadf0d8357927d2b6.