now ts fixed