Better STI handling