Fixed ts service