Fixing broken modules
Fixed modules