TMapping processing fix