Fixed loading from XML