Fixed tracked models

Should fix #2