Fix issue MR-499 - TS Gateway is not working in latest release 1.71