Fixed issue with models saving