Github issues #121, #122: t+