FIX DTS generation