Added hack to avoid DT API bug