Fixed object model when loading from file