Fix to support Chromium