Bug fix to run on Linux