Fix SI and SO