Portability fix for the bug fix.