Fixed issue with tcserver