Fixed issues: t+