Mario, Shruthi | #1131 | Fixing the module startup issues.