Fixed legacy model storage logic.