Fix corner-case model resolution