Fix bug with STI