fixed tmap mixins