Fix Nationbuilder model