fixed threading prob w/ double mapping track