Fix for OSTF.