DO NOT MERGE fix ModelService