Revert "MOD Fix 17"

This reverts commit e198f7581898d38ac4545c578d07fb655cc9a899.