TMC - RELEASE 3.5.0 Fix