Fix to TSJ