Updated opensource_fix