fix defmodel macro