partial fix for models