Another fix for issues of Nightly FF