Fixed STI bug