fixed the STI issues at least it appears so for now