more model fixing