Fix for OSTF