Fixed possible messed up loading order.