FIX: Fix KIT and time generalization