Change fixed TC management to suggestion of Thomas Ahle @ C.