fixing load order issues