Fix Bug for Firefox