Revert "MOD Fix 41"

This reverts commit 9aa29657878db9ee53e465cabf91c7b2bdebdf88.