Fixed Module Loading Issue

Fixed Module Loading Issue