Fix bug with FF saving