Fix to the Mac fix, to make it also work on Linux