FIX: Fix for non-TDT system