Fix github issue #115
Phase 3: t+