wip on tmap bug