Tentative fix for Linux