Fix MTP and correct Model