Fix storage in FF