fixing mprime class - too invasive