Fixing model_type_value issue