Fix to allow model objects: