Fixing load order
fixing build