Fix the fix for improved portability.