FIX: Load order bug