Fix loading of models