fix #543 fixes on models