Fixed FFOS bug
Merge pull request #62 from Yahkob/feature

Fixed FFOS bug