Fixing TM to work without use of SM and FM modules