Fixed routing for TA

Fixed issue #16