fixing compatiblity with ff