Fix STI problem on production