really fix mtp (i think again)