Check more carefully for partitioned models