Fixed FF Bug