fix nested models