Firefox issue fix