fixes for recursive models