FIX: Follow CTK PR