Fix for recent test failure on Linux