temporary solution for TCS v1.4