Applied Firefox Related Bug Fix