Github issue #109, #120: t+