Fixed FFOS bug